some rearranging, Transform stuff