Add more stop conditions