MainActivity modified