Checking back in changes that got lot in merging errors.