added set, simplified transformations