upping version, rearranging