working on refactoring options