[Upg] refatoring divers