Improved: data polling
Fixed: merge