enhance security check conditions