Add hybrid stuff
Fixing Branch
fixing