Updating for 4.0 (first half)