Switched int to short for mem storage