Updated for v0.99