Again.

Some changes in the hope of making this work.