Kba refactor