updata solution 6