rework cancel/prack handling