Updated to accommodate changes to final TRIM export