Final BOM Update