Added county saving, removed required elements