Using core.h and modified API