Finish changing back to m,n for CBP example