FinalState seems fixed. TODO verify