wip improving QPSCD accuracy and performance