Should here modify like above, just remove the debug branch?