tweaks  for remote deployed