Rework behavior handling