Modified version of the core