Fixed Security and added $SAFE = 2