Change detection of row state; change arg order