Incorporating suggestions by Jon and Shaunak.