BOM update

BOM is not final yet.