Normalise treatment of options