Last changes for references and for loop