comment parsing added