More Q conversion work in progress