adding 0.7.0 code
adding rest of 0.7.0 code.