updated plan and removed order split hack