Adjusted code to deal with naming change in bcore. Now or never