Removed lock (too many issues)