Changed from shorts to ints.