improves to parser