New version of paper

Made changes to fit in with the newer version of our paper