minor changes with Nahuel