supporting returning previous Option; add examples