Implemented extra credit