updated for ver1.2