Added a bit more verification