Updated files to match master