Big clean-up of row locking - follow chain