Rewrote UpdateQ, not working yet