merging casey's comments into WIP