More improvements with sharing. Almost in beta