Any way to make this optional?