refactor to use hierarchical model