updating almost done 2