Updated files to master equivalents