Made last changes