taking out the tunneling flag and handling changes manually