updated to 3.0 stuff