New version with multiple options