KPT: Jim et al. refactor