further changes toward 1.0