nyilacska, + refactor