making -universal truly universal