added polling shit