Added ability to save comments