Made 2 more improvements to try to get to the correct state.