Updated for v0.3b