Changes as per comments