Trying to fix data and service delay