updated working code- Still missing Hybrid Versions