05/05/2013: Shubha: Adding all again