Implement Regine's feedback

2 jobs for master in 20 seconds