Further trim functionalities
Modify existing functions

Not completed yet