Finishing Hybrid work

Signed-off-by: Obed N Munoz <obed.n.munoz@gmail.com>