Parially, a patch from Scott McKellar: