Added Lorenz, Added OnAlert, Seperated Cases