Fixing tony's comments