Take 2 at updating to use 3.0