added comments and additional actions