finalise up and aup reorder/refactoring