merging Ahmet's Update StartingActivity.java