Vickram's changes for apps.