Changes as per Devi's comment