fix derp and rearrange