Updated for Query