Work in progress in new converter between 1.5 and 2.0