refactoring droller stuff