some work to update to the new RQL (more to come)