removed comments
tried to insert locking - not working yet