Added trimming