More refactoring
Lock