Switched from callback idea to polling