Small changes. Re-exposes previous problem.