Adding some text and removing warning messages