added functionality for commenting