refactoring agaaain :)