Modified goToNextActivity