update logic to handle primary link

update logic to handle primary link #152