Safe zone - redone

by Tobias Björsberg