almost done
finishing changes