change fun activity planning to single step process [Finishes #75835554]