added comments and alerts