I can't comment on non-diff lines but in line 280 (```int idx = static_cast<int>(value) % m_iNoStates;```)you may as well use readDisplayValue() now to keep the logic all in one place.