Updated version of challenge1