2nd commit trying to fix set-up problems.