added slow down response handling
merged conflict