Debugged a bit in the trim module.. Still not perfect