Keep the Option and flatten