Updated based on Deathmax updates