Added return to safeZ