improved scenario generation