Links improvement