Added a few checks after review