On Close now writes options