using notification view now
refactor link update for better performance