Added condition in goodbye.R