ohhhhhhhhhhhhhh yeah remove and query