ADD Fade in / fade out
FIX error in comments