Updated ver_0.1