refactor package -connyay