Added fading functionality