Updated to latest Hardware spec