Need to apply the above comments here and to instantshare