Complete the new WITH planning
Merge pull request #2421 from boggle/ronja-with

Complete the new WITH planning