Removed Voting and added BaseState