Most of the comments added