added some more verifications