Add checks for repeating steps individually