ready for merge
removal slave lock