Updated FsPlanning