refactoring
sub ride matches