Removed locking until a better solution is implemented