Changed storing ints to shorts