adapted to tarball/7