last changes before ajax work