Updated with most recent versions of files