Adding the last changes