Improved fade-in, duplicate prevention