Updates for timeout, SnIp overwrite