upgraded to latest core library APIs