finished 2.6 or higher command to prototype refactoring