The is_integrated had gotten lost in the fixed demand case causing counting to be wonky - added it back in.