Enforce now called more, and some other stuff