improved Q compatibility, needs more tests still