Added economy calculations