Change to `where` syntax