little change on core part