added sharing
accepting merges