- No effective change
- Added a few checks