Took some base fields out of Control