Added logic for modified singular units (ala last week)