Redesigned the core