Updated Queries