Implemented more comments