updated with review of f/z