Better handling of toots date

3 jobs for master in 1 minute and 18 seconds