slight refactor and remove Konacha