Added Simon's Latest Changes in