Changed the way the core renders