modified /data handler