refactored zfs