added fade in/out