Abhinav: Modifying project a little bit.