Some changes with links