moved around struct and constant values