refactor : rework trad

2 jobs for develop in 59 seconds (queued for 25 minutes and 31 seconds)