Unparser improved