checking a bit more in before refactoring