Changes for contextual voting