refactored the solo challenge