more efficient and shareable and added query options