update for poll functionality + added template