Justo Vargas - improvements