Added TODO in MainActivity