GT-765 in the middele of refactoring