modified file from Julio