rearrange solution
test edits