Few comments/suggestions