Getting core working again