adopted whif changes