make more bulletproof