merged callback and polling controllers
merged callback and polling controllers