updated Core. functionality confirmed