Comments fully implemented