Updated queries again