Simplification

Now with a new infinite prevention system!