updated for v1.0+