merge bruno's changes with deefactorials repo