Lot of changes

ping @sgomes