Added --federal and --riding switches