Upgradeing to use BOM v13