Some changes as suggested.