Added recalculate and levelup