to run on fnal batch system, improved