removed support for locking