Added voting and terser code