totally refactoring in jobs