diff --git a/README.md b/README.md
index 727bff92..73deb92e 100644
--- a/README.md
+++ b/README.md
@@ -221,20 +221,20 @@ browser.xpath("//a[@aria-label='Issues you created']") # => [Node]
 
 #### current_url : `String`
 
-Returns current window location href.
+Returns current top window location href.
 
 ```ruby
 browser.goto("https://google.com/")
 browser.current_url # => "https://www.google.com/"
 ```
 
-#### title : `String`
+#### current_title : `String`
 
-Returns current window title
+Returns current top window title
 
 ```ruby
 browser.goto("https://google.com/")
-browser.title # => "Google"
+browser.current_title # => "Google"
 ```
 
 #### body : `String`
@@ -604,19 +604,17 @@ browser.execute(%(1 + 1)) # => true
 
 ## Frames
 
-#### frame_url
-#### frame_title
-#### within_frame(frame, &block)
+#### frames
+#### main_frame
+#### frame_by
 
 Play around inside given frame
 
 ```ruby
 browser.goto("https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe")
-frame = browser.at_xpath("//iframe")
-browser.within_frame(frame) do
-  puts browser.frame_title # => HTML Demo: <iframe>
-  puts browser.frame_url # => https://interactive-examples.mdn.mozilla.net/pages/tabbed/iframe.html
-end
+frame = browser.frames[1]
+puts frame.title # => HTML Demo: <iframe>
+puts frame.url # => https://interactive-examples.mdn.mozilla.net/pages/tabbed/iframe.html
 ```
 
 
diff --git a/lib/ferrum/browser.rb b/lib/ferrum/browser.rb
index c472199e..cdb92c91 100644
--- a/lib/ferrum/browser.rb
+++ b/lib/ferrum/browser.rb
@@ -21,8 +21,8 @@ class Browser
                 headers cookies network
                 mouse keyboard
                 screenshot pdf viewport_size
+                frames frame_by main_frame
                 evaluate evaluate_on evaluate_async execute
-                frame_url frame_title within_frame
                 on] => :page
 
     attr_reader :client, :process, :contexts, :logger, :js_errors,
diff --git a/lib/ferrum/frame.rb b/lib/ferrum/frame.rb
new file mode 100644
index 00000000..fc86995e
--- /dev/null
+++ b/lib/ferrum/frame.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "ferrum/frame/dom"
+require "ferrum/frame/runtime"
+
+module Ferrum
+  class Frame
+    include DOM, Runtime
+
+    attr_reader :id, :parent_id, :page, :state, :name
+    attr_writer :execution_id
+
+    def initialize(page, id, parent_id = nil)
+      @page, @id, @parent_id = page, id, parent_id
+    end
+
+    # Can be one of:
+    # * started_loading
+    # * navigated
+    # * scheduled_navigation
+    # * cleared_scheduled_navigation
+    # * stopped_loading
+    def state=(value)
+      @state = value
+    end
+
+    def url
+      evaluate("document.location.href")
+    end
+
+    def title
+      evaluate("document.title")
+    end
+
+    def main?
+      @parent_id.nil?
+    end
+
+    def execution_id
+      raise NoExecutionContextError unless @execution_id
+      @execution_id
+    rescue NoExecutionContextError
+      @page.event.reset
+      @page.event.wait(@page.timeout) ? retry : raise
+    end
+  end
+end
diff --git a/lib/ferrum/page/dom.rb b/lib/ferrum/frame/dom.rb
similarity index 81%
rename from lib/ferrum/page/dom.rb
rename to lib/ferrum/frame/dom.rb
index d9656993..f88a2ef0 100644
--- a/lib/ferrum/page/dom.rb
+++ b/lib/ferrum/frame/dom.rb
@@ -18,13 +18,13 @@
 # inspected node (DOM.pushNodesByBackendIdsToFrontend) or described in more
 # details (DOM.describeNode).
 module Ferrum
-  class Page
+  class Frame
     module DOM
       def current_url
         evaluate("window.top.location.href")
       end
 
-      def title
+      def current_title
         evaluate("window.top.document.title")
       end
 
@@ -57,22 +57,23 @@ def xpath(selector, within: nil)
             } else {
               throw error;
             }
-          }), timeout, selector, within)
+          }), @page.timeout, selector, within)
       end
 
+      # FIXME css doesn't work for a frame w/o execution_id
       def css(selector, within: nil)
-        node_id = within&.node_id || @document_id
+        node_id = within&.node_id || @page.document_id
 
-        ids = command("DOM.querySelectorAll",
-                      nodeId: node_id,
-                      selector: selector)["nodeIds"]
+        ids = @page.command("DOM.querySelectorAll",
+                            nodeId: node_id,
+                            selector: selector)["nodeIds"]
         ids.map { |id| build_node(id) }.compact
       end
 
       def at_css(selector, within: nil)
-        node_id = within&.node_id || @document_id
+        node_id = within&.node_id || @page.document_id
 
-        id = command("DOM.querySelector",
+        id = @page.command("DOM.querySelector",
                      nodeId: node_id,
                      selector: selector)["nodeId"]
         build_node(id)
@@ -81,8 +82,8 @@ def at_css(selector, within: nil)
       private
 
       def build_node(node_id)
-        description = command("DOM.describeNode", nodeId: node_id)
-        Node.new(self, target_id, node_id, description["node"])
+        description = @page.command("DOM.describeNode", nodeId: node_id)
+        Node.new(self, @page.target_id, node_id, description["node"])
       end
     end
   end
diff --git a/lib/ferrum/page/runtime.rb b/lib/ferrum/frame/runtime.rb
similarity index 90%
rename from lib/ferrum/page/runtime.rb
rename to lib/ferrum/frame/runtime.rb
index 45b36743..378dbd7b 100644
--- a/lib/ferrum/page/runtime.rb
+++ b/lib/ferrum/frame/runtime.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ferrum
-  class Page
+  class Frame
     module Runtime
       INTERMITTENT_ATTEMPTS = ENV.fetch("FERRUM_INTERMITTENT_ATTEMPTS", 6).to_i
       INTERMITTENT_SLEEP = ENV.fetch("FERRUM_INTERMITTENT_SLEEP", 0.1).to_f
@@ -49,13 +49,13 @@ def evaluate_on(node:, expression:, by_value: true, wait: 0)
         attempts, sleep = INTERMITTENT_ATTEMPTS, INTERMITTENT_SLEEP
 
         Ferrum.with_attempts(errors: errors, max: attempts, wait: sleep) do
-          response = command("DOM.resolveNode", nodeId: node.node_id)
+          response = @page.command("DOM.resolveNode", nodeId: node.node_id)
           object_id = response.dig("object", "objectId")
           options = DEFAULT_OPTIONS.merge(objectId: object_id)
           options[:functionDeclaration] = options[:functionDeclaration] % expression
           options.merge!(returnByValue: by_value)
 
-          response = command("Runtime.callFunctionOn",
+          response = @page.command("Runtime.callFunctionOn",
                              wait: wait, **options)["result"]
                             .tap { |r| handle_error(r) }
 
@@ -76,10 +76,10 @@ def call(*args, expression:, wait_time: nil, handle: true, **options)
           params[:functionDeclaration] = params[:functionDeclaration] % expression
           params = params.merge(arguments: arguments)
           unless params[:executionContextId]
-            params = params.merge(executionContextId: execution_context_id)
+            params = params.merge(executionContextId: execution_id)
           end
 
-          response = command("Runtime.callFunctionOn",
+          response = @page.command("Runtime.callFunctionOn",
                              **params)["result"].tap { |r| handle_error(r) }
 
           handle ? handle_response(response) : response
@@ -115,9 +115,9 @@ def handle_response(response)
               # and node destroyed so we need to retrieve it each time for given id.
               # Though we can try to subscribe to `DOM.childNodeRemoved` and
               # `DOM.childNodeInserted` in the future.
-              node_id = command("DOM.requestNode", objectId: object_id)["nodeId"]
-              description = command("DOM.describeNode", nodeId: node_id)["node"]
-              Node.new(self, target_id, node_id, description)
+              node_id = @page.command("DOM.requestNode", objectId: object_id)["nodeId"]
+              description = @page.command("DOM.describeNode", nodeId: node_id)["node"]
+              Node.new(self, @page.target_id, node_id, description)
           when "array"
             reduce_props(object_id, []) do |memo, key, value|
               next(memo) unless (Integer(key) rescue nil)
@@ -140,7 +140,7 @@ def handle_response(response)
       def prepare_args(args)
         args.map do |arg|
           if arg.is_a?(Node)
-            resolved = command("DOM.resolveNode", nodeId: arg.node_id)
+            resolved = @page.command("DOM.resolveNode", nodeId: arg.node_id)
             { objectId: resolved["object"]["objectId"] }
           elsif arg.is_a?(Hash) && arg["objectId"]
             { objectId: arg["objectId"] }
@@ -154,7 +154,7 @@ def reduce_props(object_id, to)
         if cyclic?(object_id).dig("result", "value")
           return "(cyclic structure)"
         else
-          props = command("Runtime.getProperties", objectId: object_id)
+          props = @page.command("Runtime.getProperties", objectId: object_id)
           props["result"].reduce(to) do |memo, prop|
             next(memo) unless prop["enumerable"]
             yield(memo, prop["name"], prop["value"])
@@ -163,7 +163,7 @@ def reduce_props(object_id, to)
       end
 
       def cyclic?(object_id)
-        command("Runtime.callFunctionOn",
+        @page.command("Runtime.callFunctionOn",
                 objectId: object_id,
                 returnByValue: true,
                 functionDeclaration: <<~JS
diff --git a/lib/ferrum/network.rb b/lib/ferrum/network.rb
index 34c822a8..e84bc6c1 100644
--- a/lib/ferrum/network.rb
+++ b/lib/ferrum/network.rb
@@ -91,7 +91,7 @@ def subscribe
         end
 
         exchange = Network::Exchange.new(params)
-        @exchange = exchange if exchange.navigation_request?(@page.frame_id)
+        @exchange = exchange if exchange.navigation_request?(@page.main_frame.id)
         @traffic << exchange
       end
 
diff --git a/lib/ferrum/node.rb b/lib/ferrum/node.rb
index 2664fd3d..15870414 100644
--- a/lib/ferrum/node.rb
+++ b/lib/ferrum/node.rb
@@ -4,8 +4,9 @@ module Ferrum
   class Node
     attr_reader :page, :target_id, :node_id, :description, :tag_name
 
-    def initialize(page, target_id, node_id, description)
-      @page, @target_id = page, target_id
+    def initialize(frame, target_id, node_id, description)
+      @page = frame.page
+      @target_id = target_id
       @node_id, @description = node_id, description
       @tag_name = description["nodeName"].downcase
     end
@@ -14,6 +15,14 @@ def node?
       description["nodeType"] == 1 # nodeType: 3, nodeName: "#text" e.g.
     end
 
+    def frame_id
+      description["frameId"]
+    end
+
+    def frame
+      page.frame_by(id: frame_id)
+    end
+
     def focus
       tap { page.command("DOM.focus", nodeId: node_id) }
     end
diff --git a/lib/ferrum/page.rb b/lib/ferrum/page.rb
index 7a19ed65..103c49b1 100644
--- a/lib/ferrum/page.rb
+++ b/lib/ferrum/page.rb
@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
+require "forwardable"
 require "ferrum/mouse"
 require "ferrum/keyboard"
 require "ferrum/headers"
 require "ferrum/cookies"
 require "ferrum/dialog"
 require "ferrum/network"
-require "ferrum/page/dom"
-require "ferrum/page/runtime"
-require "ferrum/page/frame"
+require "ferrum/page/frames"
 require "ferrum/page/screenshot"
 require "ferrum/browser/client"
 
@@ -28,21 +27,23 @@ def reset
       end
     end
 
-    include DOM, Runtime, Frame, Screenshot
+    extend Forwardable
+    delegate %i[at_css at_xpath css xpath
+                current_url current_title url title body
+                execution_id evaluate evaluate_on evaluate_async execute] => :main_frame
+
+    include Frames, Screenshot
 
     attr_accessor :referrer
     attr_reader :target_id, :browser,
                 :headers, :cookies, :network,
-                :mouse, :keyboard
+                :mouse, :keyboard, :event, :document_id
 
     def initialize(target_id, browser)
+      @frames = {}
       @target_id, @browser = target_id, browser
       @event = Event.new.tap(&:set)
 
-      @frames = {}
-      @waiting_frames ||= Set.new
-      @frame_stack = []
-
       host = @browser.process.host
       port = @browser.process.port
       ws_url = "ws://#{host}:#{port}/devtools/page/#{@target_id}"
@@ -135,8 +136,7 @@ def on(name, &block)
     private
 
     def subscribe
-      super
-
+      frames_subscribe
       network.subscribe
 
       on("Network.loadingFailed") do |params|
@@ -144,7 +144,7 @@ def subscribe
         # Set event as we aborted main request we are waiting for
         if network.request&.id == id && canceled == true
           @event.set
-          @document_id = get_document_id
+          get_document_id
         end
       end
 
@@ -165,7 +165,7 @@ def subscribe
         # `frameStoppedLoading` doesn't occur if status isn't success
         if network.status != 200
           @event.set
-          @document_id = get_document_id
+          get_document_id
         end
       end
     end
@@ -198,7 +198,7 @@ def prepare_page
         # occurs and thus search for nodes cannot be completed. Here we check
         # the history and if the transitionType for example `link` then
         # content is already loaded and we can try to get the document.
-        @document_id = get_document_id
+        get_document_id
       end
     end
 
@@ -210,7 +210,7 @@ def inject_extensions
         # We also evaluate script just in case because
         # `Page.addScriptToEvaluateOnNewDocument` doesn't work in popups.
         command("Runtime.evaluate", expression: extension,
-                                    contextId: execution_context_id,
+                                    contextId: execution_id,
                                     returnByValue: true)
       end
     end
@@ -237,7 +237,7 @@ def combine_url!(url_or_path)
     end
 
     def get_document_id
-      command("DOM.getDocument", depth: 0).dig("root", "nodeId")
+      @document_id = command("DOM.getDocument", depth: 0).dig("root", "nodeId")
     end
   end
 end
diff --git a/lib/ferrum/page/frame.rb b/lib/ferrum/page/frame.rb
deleted file mode 100644
index b437c5d6..00000000
--- a/lib/ferrum/page/frame.rb
+++ /dev/null
@@ -1,142 +0,0 @@
-# frozen_string_literal: true
-
-module Ferrum
-  class Page
-    module Frame
-      attr_reader :frame_id
-
-      def execution_context_id
-        context_id = current_execution_context_id
-        raise NoExecutionContextError unless context_id
-        context_id
-      rescue NoExecutionContextError
-        @event.reset
-        @event.wait(timeout) ? retry : raise
-      end
-
-      def frame_name
-        evaluate("window.name")
-      end
-
-      def frame_url
-        evaluate("window.location.href")
-      end
-
-      def frame_title
-        evaluate("document.title")
-      end
-
-      def within_frame(frame)
-        unless frame.is_a?(Node)
-          raise ArgumentError, "Node is expected, but #{frame.class} is given"
-        end
-
-        frame_id = frame.description["frameId"]
-        @frame_stack << frame_id
-        inject_extensions
-        yield
-      ensure
-        @frame_stack.pop
-      end
-
-      private
-
-      def subscribe
-        super if defined?(super)
-
-        on("Page.frameAttached") do |params|
-          @frames[params["frameId"]] = { "parent_id" => params["parentFrameId"] }
-        end
-
-        on("Page.frameStartedLoading") do |params|
-          @waiting_frames << params["frameId"]
-          @event.reset
-        end
-
-        on("Page.frameNavigated") do |params|
-          id = params["frame"]["id"]
-          if frame = @frames[id]
-            frame.merge!(params["frame"].select { |k, _| k == "name" || k == "url" })
-          end
-        end
-
-        on("Page.frameScheduledNavigation") do |params|
-          @waiting_frames << params["frameId"]
-          @event.reset
-        end
-
-        on("Page.navigatedWithinDocument") do
-          if @waiting_frames.include?(params["frameId"])
-            @waiting_frames.delete(params["frameId"])
-            @event.set if @waiting_frames.empty?
-          end
-        end
-
-        on("Page.frameStoppedLoading") do |params|
-          # `DOM.performSearch` doesn't work without getting #document node first.
-          # It returns node with nodeId 1 and nodeType 9 from which descend the
-          # tree and we save it in a variable because if we call that again root
-          # node will change the id and all subsequent nodes have to change id too.
-          if params["frameId"] == @frame_id
-            @event.set if @waiting_frames.empty?
-            @document_id = get_document_id
-          end
-
-          if @waiting_frames.include?(params["frameId"])
-            @waiting_frames.delete(params["frameId"])
-            @event.set if @waiting_frames.empty?
-          end
-        end
-
-        on("Network.requestWillBeSent") do |params|
-          if params["frameId"] == @frame_id
-            # Possible types:
-            # Document, Stylesheet, Image, Media, Font, Script, TextTrack, XHR,
-            # Fetch, EventSource, WebSocket, Manifest, SignedExchange, Ping,
-            # CSPViolationReport, Other
-            @event.reset if params["type"] == "Document"
-          end
-        end
-
-        on("Runtime.executionContextCreated") do |params|
-          context_id = params.dig("context", "id")
-          @execution_context_id ||= context_id
-
-          frame_id = params.dig("context", "auxData", "frameId")
-          @frame_id ||= frame_id # Remember the very first frame since it's the main one
-
-          if @frames[frame_id]
-            @frames[frame_id].merge!("execution_context_id" => context_id)
-          else
-            @frames[frame_id] = { "execution_context_id" => context_id }
-          end
-        end
-
-        on("Runtime.executionContextDestroyed") do |params|
-          context_id = params["executionContextId"]
-
-          if @execution_context_id == context_id
-            @execution_context_id = nil
-          end
-
-          _id, frame = @frames.find { |_, p| p["execution_context_id"] == context_id }
-          frame["execution_context_id"] = nil if frame
-        end
-
-        on("Runtime.executionContextsCleared") do
-          # If we didn't have time to set context id at the beginning we have
-          # to set lock and release it when we set something.
-          @execution_context_id = nil
-        end
-      end
-
-      def current_execution_context_id
-        if @frame_stack.empty?
-          @execution_context_id
-        else
-          @frames.dig(@frame_stack.last, "execution_context_id")
-        end
-      end
-    end
-  end
-end
diff --git a/lib/ferrum/page/frames.rb b/lib/ferrum/page/frames.rb
new file mode 100644
index 00000000..5b745edf
--- /dev/null
+++ b/lib/ferrum/page/frames.rb
@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require "ferrum/frame"
+
+module Ferrum
+  class Page
+    module Frames
+      attr_reader :main_frame
+
+      def frames
+        @frames.values
+      end
+
+      def frame_by(id: nil, execution_id: nil, name: nil)
+        if id
+          @frames[id]
+        elsif execution_id
+          frames.find { |f| f.execution_id == execution_id }
+        elsif name
+          frames.find { |f| f.name == name }
+        else
+          raise ArgumentError
+        end
+      end
+
+      def frames_subscribe
+        on("Page.frameAttached") do |params|
+          parent_frame_id, frame_id = params.values_at("parentFrameId", "frameId")
+          @frames[frame_id] = Frame.new(self, frame_id, parent_frame_id)
+        end
+
+        on("Page.frameStartedLoading") do |params|
+          frame = @frames[params["frameId"]]
+          frame.state = :started_loading
+          @event.reset
+        end
+
+        on("Page.frameNavigated") do |params|
+          frame_id, name = params["frame"]&.values_at("id", "name")
+          frame = @frames[frame_id]
+          frame.state = :navigated
+          frame.name = name unless name.to_s.empty?
+        end
+
+        on("Page.frameScheduledNavigation") do |params|
+          frame = @frames[params["frameId"]]
+          frame.state = :scheduled_navigation
+          @event.reset
+        end
+
+        on("Page.frameClearedScheduledNavigation") do |params|
+          frame = @frames[params["frameId"]]
+          frame.state = :cleared_scheduled_navigation
+          @event.set if idling?
+        end
+
+        on("Page.frameStoppedLoading") do |params|
+          # `DOM.performSearch` doesn't work without getting #document node first.
+          # It returns node with nodeId 1 and nodeType 9 from which descend the
+          # tree and we save it in a variable because if we call that again root
+          # node will change the id and all subsequent nodes have to change id too.
+          if main_frame.id == params["frameId"]
+            @event.set if idling?
+            get_document_id
+          end
+
+          frame = @frames[params["frameId"]]
+          frame.state = :stopped_loading
+
+          @event.set if idling?
+        end
+
+        on("Page.navigatedWithinDocument") do
+          @event.set if idling?
+        end
+
+        on("Network.requestWillBeSent") do |params|
+          if params["frameId"] == main_frame.id
+            # Possible types:
+            # Document, Stylesheet, Image, Media, Font, Script, TextTrack, XHR,
+            # Fetch, EventSource, WebSocket, Manifest, SignedExchange, Ping,
+            # CSPViolationReport, Other
+            @event.reset if params["type"] == "Document"
+          end
+        end
+
+        on("Runtime.executionContextCreated") do |params|
+          context_id = params.dig("context", "id")
+          frame_id = params.dig("context", "auxData", "frameId")
+          frame = @frames[frame_id] || Frame.new(self, frame_id)
+          frame.execution_id = context_id
+
+          @main_frame ||= frame
+          @frames[frame_id] ||= frame
+        end
+
+        on("Runtime.executionContextDestroyed") do |params|
+          execution_id = params["executionContextId"]
+          frame = frame_by(execution_id: execution_id)
+          frame.execution_id = nil
+        end
+      end
+
+      private
+
+      def idling?
+        @frames.all? { |_, f| f.state == :stopped_loading }
+      end
+    end
+  end
+end
diff --git a/spec/frame_spec.rb b/spec/frame_spec.rb
index b4fe5de4..d22aa311 100644
--- a/spec/frame_spec.rb
+++ b/spec/frame_spec.rb
@@ -7,38 +7,26 @@ module Ferrum
     context "frame support" do
       it "supports selection by index" do
         browser.goto("/ferrum/frames")
-        frame = browser.at_xpath("//iframe")
-
-        browser.within_frame(frame) do
-          expect(browser.frame_url).to end_with("/ferrum/slow")
-        end
+        frame = browser.at_xpath("//iframe").frame
+        expect(frame.url).to end_with("/ferrum/slow")
       end
 
       it "supports selection by element" do
         browser.goto("/ferrum/frames")
-        frame = browser.at_css("iframe[name]")
-
-        browser.within_frame(frame) do
-          expect(browser.frame_url).to end_with("/ferrum/slow")
-        end
+        frame = browser.at_css("iframe[name]").frame
+        expect(frame.url).to end_with("/ferrum/slow")
       end
 
       it "supports selection by element without name or id" do
         browser.goto("/ferrum/frames")
-        frame = browser.at_css("iframe:not([name]):not([id])")
-
-        browser.within_frame(frame) do
-          expect(browser.frame_url).to end_with("/ferrum/headers")
-        end
+        frame = browser.at_css("iframe:not([name]):not([id])").frame
+        expect(frame.url).to end_with("/ferrum/headers")
       end
 
       it "supports selection by element with id but no name" do
         browser.goto("/ferrum/frames")
-        frame = browser.at_css("iframe[id]:not([name])")
-
-        browser.within_frame(frame) do
-          expect(browser.frame_url).to end_with("/ferrum/get_cookie")
-        end
+        frame = browser.at_css("iframe[id]:not([name])").frame
+        expect(frame.url).to end_with("/ferrum/get_cookie")
       end
 
       it "waits for the frame to load" do
@@ -46,26 +34,23 @@ module Ferrum
         browser.execute <<-JS
           document.body.innerHTML += "<iframe src='/ferrum/slow' name='frame'>"
         JS
-        frame = browser.at_xpath("//iframe[@name='frame']")
 
-        browser.within_frame(frame) do
-          expect(browser.frame_url).to end_with("/ferrum/slow")
-          expect(browser.body).to include("slow page")
-        end
-        expect(URI.parse(browser.frame_url).path).to eq("/")
+        frame = browser.at_xpath("//iframe[@name='frame']").frame
+        expect(frame.url).to end_with("/ferrum/slow")
+        expect(frame.body).to include("slow page")
+
+        expect(browser.main_frame.url).to end_with("/")
       end
 
       it "waits for the cross-domain frame to load" do
         browser.goto("/ferrum/frames")
         expect(browser.current_url).to eq(base_url("/ferrum/frames"))
-        frame = browser.at_xpath("//iframe[@name='frame']")
+        frame = browser.at_xpath("//iframe[@name='frame']").frame
 
-        browser.within_frame(frame) do
-          expect(browser.frame_url).to end_with("/ferrum/slow")
-          expect(browser.body).to include("slow page")
-        end
+        expect(frame.url).to end_with("/ferrum/slow")
+        expect(frame.body).to include("slow page")
 
-        expect(browser.frame_url).to end_with("/ferrum/frames")
+        expect(browser.current_url).to end_with("/ferrum/frames")
       end
 
       context "with src == about:blank" do
@@ -74,10 +59,8 @@ module Ferrum
           browser.execute <<-JS
             document.body.innerHTML += "<iframe src='about:blank' name='frame'>"
           JS
-          frame = browser.at_xpath("//iframe[@name='frame']")
-          browser.within_frame(frame) do
-            expect(browser.body).to eq("<html><head></head><body></body></html>")
-          end
+          frame = browser.at_xpath("//iframe[@name='frame']").frame
+          expect(frame.body).to eq("<html><head></head><body></body></html>")
         end
 
         it "doesn't hang if built by JS" do
@@ -90,11 +73,8 @@ module Ferrum
             iframeDocument.write(content);
             iframeDocument.close();
           JS
-          frame = browser.at_xpath("//iframe[@name='frame']")
-
-          browser.within_frame(frame) do
-            expect(browser.body).to include("Hello Frame")
-          end
+          frame = browser.at_xpath("//iframe[@name='frame']").frame
+          expect(frame.body).to include("Hello Frame")
         end
       end
 
@@ -104,11 +84,8 @@ module Ferrum
           browser.execute <<-JS
             document.body.innerHTML += "<iframe srcdoc='<p>Hello Frame</p>' name='frame'>"
           JS
-          frame = browser.at_xpath("//iframe[@name='frame']")
-
-          browser.within_frame(frame) do
-            expect(browser.body).to include("Hello Frame")
-          end
+          frame = browser.at_xpath("//iframe[@name='frame']").frame
+          expect(frame.body).to include("Hello Frame")
         end
 
         it "doesn't hang if the frame is filled by JS" do
@@ -123,11 +100,8 @@ module Ferrum
             iframeDocument.write(content);
             iframeDocument.close();
           JS
-          frame = browser.at_xpath("//iframe[@name='frame']")
-
-          browser.within_frame(frame) do
-            expect(browser.body).to include("Hello Frame")
-          end
+          frame = browser.at_xpath("//iframe[@name='frame']").frame
+          expect(frame.body).to include("Hello Frame")
         end
       end
 
@@ -137,13 +111,11 @@ module Ferrum
           document.body.innerHTML += "<iframe src='/ferrum/click_test' name='frame'>"
         JS
         sleep 0.5
-        frame = browser.at_xpath("//iframe[@name = 'frame']")
+        frame = browser.at_xpath("//iframe[@name = 'frame']").frame
 
-        browser.within_frame(frame) do
-          log = browser.at_css("#log")
-          browser.at_css("#one").click
-          expect(log.text).to eq("one")
-        end
+        log = frame.at_css("#log")
+        frame.at_css("#one").click
+        expect(log.text).to eq("one")
       end
 
       it "supports clicking in a frame with padding", skip: true do
@@ -151,13 +123,11 @@ module Ferrum
         browser.execute <<-JS
           document.body.innerHTML += "<iframe src='/ferrum/click_test' name='padded_frame' style='padding:100px;'>"
         JS
-        frame = browser.at_xpath("//iframe[@name = 'padded_frame']")
+        frame = browser.at_xpath("//iframe[@name = 'padded_frame']").frame
 
-        browser.within_frame(frame) do
-          log = browser.at_css("#log")
-          browser.at_css("#one").click
-          expect(log.text).to eq("one")
-        end
+        log = frame.at_css("#log")
+        frame.at_css("#one").click
+        expect(log.text).to eq("one")
       end
 
       it "supports clicking in a frame nested in a frame", skip: true do
@@ -172,35 +142,27 @@ module Ferrum
           document.body.innerHTML += "<iframe src='/ferrum/nested_frame_test' name='outer_frame' style='padding:200px'>"
         JS
 
-        browser.within_frame "outer_frame" do
-          browser.within_frame "inner_frame" do
-            log = browser.at_css("#log")
-            browser.at_css("#one").click
-            expect(log.text).to eq("one")
-          end
-        end
+        sleep 0.5
+
+        inner_frame = browser.frame_by(name: "inner_frame")
+        log = inner_frame.at_css("#log")
+        inner_frame.at_css("#one").click
+        expect(log.text).to eq("one")
       end
 
       it "does not wait forever for the frame to load" do
         browser.goto
 
-        expect do
-          browser.within_frame("omg") {}
-        end.to(raise_error do |e|
-          # expect(e).to be_a(Capybara::ElementNotFound)
-        end)
+        frame = browser.frame_by(name: "omg")
+
+        expect(frame).to be_nil
       end
 
       it "can get the frames url" do
         browser.goto("/ferrum/frames")
 
-        frame = browser.at_xpath("//iframe")
-        browser.within_frame(frame) do
-          expect(browser.frame_url).to end_with("/ferrum/slow")
-          expect(browser.current_url).to end_with("/ferrum/frames")
-        end
-
-        expect(browser.frame_url).to end_with("/ferrum/frames")
+        frame = browser.at_xpath("//iframe").frame
+        expect(frame.url).to end_with("/ferrum/slow")
         expect(browser.current_url).to end_with("/ferrum/frames")
       end
     end
diff --git a/spec/network_spec.rb b/spec/network_spec.rb
index 22bb2c5b..9ba849e1 100644
--- a/spec/network_spec.rb
+++ b/spec/network_spec.rb
@@ -210,10 +210,8 @@ module Ferrum
         expect(browser.network.status).to eq(200)
         expect(browser.body).to include("We are loading some unwanted action here")
 
-        frame = browser.at_xpath("//iframe[@name = 'framename']")
-        browser.within_frame(frame) do
-          expect(browser.body).not_to include("We shouldn't see this.")
-        end
+        frame = browser.at_xpath("//iframe[@name = 'framename']").frame
+        expect(frame.body).not_to include("We shouldn't see this.")
       end
 
       it "supports wildcards" do
@@ -227,15 +225,11 @@ module Ferrum
         expect(browser.network.status).to eq(200)
         expect(browser.body).to include("We are loading some wanted action here")
 
-        frame = browser.at_xpath("//iframe[@name = 'framename']")
-        browser.within_frame(frame) do
-          expect(browser.body).not_to include("We should see this.")
-        end
+        frame = browser.at_xpath("//iframe[@name = 'framename']").frame
+        expect(frame.body).not_to include("We should see this.")
 
-        frame = browser.at_xpath("//iframe[@name = 'unwantedframe']")
-        browser.within_frame(frame) do
-          expect(browser.body).not_to include("We shouldn't see this.")
-        end
+        frame = browser.at_xpath("//iframe[@name = 'unwantedframe']").frame
+        expect(frame.body).not_to include("We shouldn't see this.")
       end
 
       it "allows whitelisted urls" do
@@ -249,15 +243,11 @@ module Ferrum
         expect(browser.network.status).to eq(200)
         expect(browser.body).to include("We are loading some wanted action here")
 
-        frame = browser.at_xpath("//iframe[@name = 'framename']")
-        browser.within_frame(frame) do
-          expect(browser.body).to include("We should see this.")
-        end
+        frame = browser.at_xpath("//iframe[@name = 'framename']").frame
+        expect(frame.body).to include("We should see this.")
 
-        frame = browser.at_xpath("//iframe[@name = 'unwantedframe']")
-        browser.within_frame(frame) do
-          expect(browser.body).not_to include("We shouldn't see this.")
-        end
+        frame = browser.at_xpath("//iframe[@name = 'unwantedframe']").frame
+        expect(frame.body).not_to include("We shouldn't see this.")
       end
 
       it "supports wildcards" do
@@ -271,15 +261,11 @@ module Ferrum
         expect(browser.network.status).to eq(200)
         expect(browser.body).to include("We are loading some wanted action here")
 
-        frame = browser.at_xpath("//iframe[@name = 'framename']")
-        browser.within_frame(frame) do
-          expect(browser.body).to include("We should see this.")
-        end
+        frame = browser.at_xpath("//iframe[@name = 'framename']").frame
+        expect(frame.body).to include("We should see this.")
 
-        frame = browser.at_xpath("//iframe[@name = 'unwantedframe']")
-        browser.within_frame(frame) do
-          expect(browser.body).to include("We shouldn't see this.")
-        end
+        frame = browser.at_xpath("//iframe[@name = 'unwantedframe']").frame
+        expect(frame.body).to include("We shouldn't see this.")
       end
     end
   end