more chnages related to the unique_id. need to pop it at the right time or the unique id will not be used to recognize existing jobs