started working on Query