added nick's changes

intergrated nicks changes to the project.