updated for 0.4.0-RC1