edit ver1.2