Reordred things a bit