Updated names/ changed a few lines.