Chris's code added to master file