unrefactored commit, solves problem with reordering