refactor from 'qatp' to 'dr'