Revamped with Queries