updated for latest version of core library