added lock / unlock handlers