Re-adding more changes

Re-adding double checking FState... Lost somewhere