Add original contested lock check back in