finish up v1.0