progress on 2.0 conversion