Q definitions updated