Forgot to add some crucial queries