Porting to new versio of lovetoys