updated with comment view