improving new plan form, adding intervals to plan models