Updates for the transforms
Updates on a renamed file
fixes merge conflicts