Added initial locking