FIXME for voting added