Update 3.0

It's not a show stopper for this PR.