Advanced planning (30/35)

Advanced planning