Made a number of changes but save plan no longer crashes the first time around