Sarang | Source code changes