fixing up Core