Done a Quick update

This is the final version before hand-in