Dev henrique

last push. Hopefully