adding skip step support