changed jobs to use whenever