- Moved conditional bp checking