Adding baz3 through squash merge