Updated with Bambu Comments