AMENDED AND RESTATED CONTROLLED ACCOUNT AGREEMENT (WATERFALL ACCOUNT)