last changes for redesign