Changed default timeout timer and added subs-lock