added poll control