final update ver1