Updated for release 0.99.7