Attempt to speed up link functions a bit.
Merge branch 'development'