FIXED everything minuse the quereryans nonsense