last changes for popup