Added addtl checks