Removing end.state counting to test