Functionally good...Could improve to match BLR/BOM...

Functionally good...Could improve to match BLR/BOM/DEL