final commit before data structure changes