add support for location swap and random death