Revert some changes due to challenge