current hops refactoring