Changed to updated FsPlanning branch