Chris's changes