Added recalculate and levelUp