#123 Adapt links