Simplified some of the core core.