Update for some changes of Chopping.