update some state handling logic discovered while building Unity variant