Put back spring; add custom_plan for zeus