added comments and lockout time
synching files for merge