slight changes to main driver