Refactoring, but keeping get on option...