more Q changes from Orit