Improved version for CodeCamp