Updating for 3.0