Moved the heavy-duty calculation out into the util