Re-added underlining (not excessive)