Saransh's changes