Smoother flow with alerts