tweak and integrate notrim original