some change...still some error...