Feature/concurrent hybrid