added a few changes for adding event and share and hack