1 piece at a time & other changes