removed an extra set of calls to top
fixed compile error
Merge remote-tracking branch 'becca/split-planner' into split-planner