Re-order PROPER ;)