added thiagos changes