Upgraded to latest components