Revert "Tidied up safe zones into one loop"

This reverts commit 9fdfb2af0f3cdc133028c937d1b0f3c60643c629.