added comments and lockout time