Changes as requested