More work to elimiate locked in transaction issue