Modifications for Link