rework transform stuff for the big finish