Sagar's changes