Removed locks for testing