Merged with Becca's modified planners