updated to latest core api