Adding in version 0.8 code base
adding 0.8 code