trying to fix LOCK issues... 2