Add Log Messgaes and Remove Locking