working on comments