* included modifications suggested by Ludwig