Upgraded to new specs.