#75 Improved trimming policy