5/28 changes to structure