Updated 'App Start' Logic