Porting the the newest Nodeca Core. (part 6)