Merging ninos changed

Kill this :)