Upgrade moment and q.