more ubiquituity changes