added core3 modification