updated 4.0 stuff