Added more voting logic