Changed all the files to Andrew's most recent code!