add more security checks