NotificationService & MainActivity added