refactor underway