improvements to BOM