adapted to the last changes in Q