Add handling of feds for lower and upper overview