Added states and changed times