Changes as per the comments