rework hybrid

rework hybrid