two last changes