SSP-814 Fixed Challenges Sorted