some more changes - working on local now to debug new query