last changes for the first call