Update on the 2016/2017 waiver situation