Replaced the unparser with such easier code