Made last changes before delivering