Adding Safety To P320