Changes made by Nik Kalyani (nik@kalyani.com).