Added some new (possibly temporary) Q calculations