Everything working, added 2 queries