Added Hybrid + simple changes