Addressed Sebastian's comments on locking; also tried caps negotiation :(
indent
Caps negotiation following Sebastian's comments
style