Modify sampling code for new design
Modify prediction code for new design