touched up core.h