pulled in Luke's changes

@lawinslow take a look?