New setup for FNAL