Updated per peer review - move away from wrapper