Demo Avoidance should be faster + some other bugs