Updated with newest versions of all files