'ekino' refactor