fully 3.0-ify