Changed share code behaviour, again