Futher work towards fluent conversion