refactor overdrive