Niko's Contributions Added