change two job implementation to one job implementation