Added NPM and overflow check.