Added Gilly's code to the project.