last changes before linear tests