Final3

Third Final Revision. Made a stupid mistake and forgot something.