Improved the sorting in user story 5