trim modifications - still need to do more