The latest code modified by Makarand as of July 2nd