updated for 1.0.0-beta3