added novi
added some changes
D