FIX: The process in each step does not resume at the start
Added: Temporary measures