updated deep core and refactor to avoid compilation errors