Huge revision to match spec sheets requirements