Set ops

This branch is forked from the "mega-cleaning", that's why it includes its commits