trims code
Merge branch 'trims-code'