social things added
merging
fixxing social stoory