Added old code (commented) just to find differences. Don't know what's happening