Update for 2 axis program and model design improvements