pushing changes made during 2/26 meeting