rearranging, added share charm support