Updated Application Flow