Fixed BOM
Enahnced replacer