AMENDMENT NO. 2 AND WAIVER