Merged vidyaranya's changes