- refactored the polling to be less memory heavy