Enhance coverage computing script (2)