synching with the latest version of the mirage-net code