Update improve hero return value