Pushed several changes on 4/27 on Gates 8