Sorted correctly now