Ported to new version of lovetoys