Updated files for merge