Tidied up safe zones into one loop

Less KB's used!