Continue working on comments