last changes on msq.r