updated Q calls, fixes #21