Update Dan's plan