Arena is now 1x2 -> need to get rid of magic numbers