Surya's changes