Added Fade in & Fade out based off property