updating almost done 1