Updated files to take into account