Updated to match 2011 hardware config