Adding changes from Luciorota