Chris's edits to make it work