better unite handling