more turbo refactoring