Changed type of unitData to short