Updated to work with gr-baz