updated to app and app_server