This could also be moved to the query itself.