Some changes as suggested