Changes
Merged file with Phils comments