Hosted refactor
Hosted refactor