big update for the oop query