added polling for manual version