Updated gr-baz