some error edited