clean-up 2

clean-up.

We should be able to switch the base.

2