Updated plan, and added current model