added more verifications