Adjusted to remove Market Share adjustment without removing bug-fixes.