Little changes according Daniels warnings.