added shop2 planner, copy from Daniel