Large update, v1.0