checkpoint untested major overhaul