Improve mdoe 'free' and 'normal'