Incorporated the comments and is pushed