Updated ver_1