Final update

Email me if anything else needs to be added