updated for v3.0.0 RC1
future work