added later .when test and fixed an error with handling _archive in tracking (it was getting overwritten).