added last changes before delivery