Updated to use app->after