Updated with better security directions