refactoring of the job definition, started to collect data.