Changes by Andrew and Nilesh