More improvements with Safe Zone