Minor changes as requested