Second pass added to main.