moving Breno\'s additions to one of our files