Partial conversion to 2.0