Ported to new version of Lovetoys