Finishing 2.3 conversion