Added Chris's changes