Now fault tolerant and allows skipping