melee updates, not yet finished