worked on comments
force merged