Features/better share