Updated for 2.0.7 release