Added some of Will's initial changes