Address Niko's comments