put the other definition of a trim set in the header file too
merge main working branch