fixed bug and updata