re-write to move data requests