merging changes from niko