Almost finished mana update