almost done
more changes