Fix the state problem + handling fuel into consideration for expansion