lots of updates from working through Broad deployment