New shared with fixes