Made some of the int's into long's