Changes as asked