refactor to follow aug'13 pagoda pattern