Nick's changes 2
Nick's changes 3