upgraded to latest components