Finished fixing the sharing