Tweaked WorldFactory