Last changes and then let's change the grammars. Now is correctly
working