added security, performance, and removed irrelevant items