@sauliusg if we could add the lock in that would be good.