last changes before Tue class