Updated queries from Richard