slight refactoring off the pulldown mode...