last changes in parsing