Revamped API Poll slightly