updates #1, v1.0