PR - updated core helper