AMENDMENT NO. 6, WAIVER AND AGREEMENT