Updated for 0.4