Updated for v0.04