some rearranging, skeletoning