Added Neil's changes