Changes to AliveEntity and Square controllers