Repushed handle_job code