Some changes to link