added locking classes again