small changes, elminated lock functionality