zt: some changes