Updated for 2.0.8 release