lock added, tested