updated for bfs-product-1 new machine env