Updated for new melee base