v1.2 upgrade for links more