FUNCTIONAL STATE, Adaptation fix and dispatch change