Some changes

Signed-off-by: Ricardo Leitão <ricardo7rl@gmail.com>