Update of definitions and input from Char