Some updates to ease state switching