Added plan, fixed formatting