hound refactor 2