Updated controller to actually allow polling