Update 1.0 by Niko