Changed timing and added fadeout