Fix, Link Function And Some Other Work