minor changes on state rep. TODO