latest build with @sergiocontrino changes