Totaly updated the users query