almost complete the comments part