still refactoring in utils