Improvements to RDO state, but it still might not be working