Almost done integrating surya's part