(perf) hero service

hero service - finishing touches