diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 56c609121..98c8bf1b9 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -4,11 +4,31 @@ class WelcomeController < ApplicationController
   layout "devise", only: :welcome
 
   def index
-    @featured_debates = Debate.sort_by_confidence_score.limit(3).for_render
-    set_debate_votes(@featured_debates)
+    current_user ? signed_in_home : public_home
   end
 
   def welcome
   end
 
+  private
+    def public_home
+      @featured_debates = Debate.sort_by_confidence_score.limit(3).for_render
+      set_debate_votes(@featured_debates)
+
+      @featured_proposals = Proposal.sort_by_confidence_score.limit(3).for_render
+      set_proposal_votes(@featured_proposals)
+    end
+
+    def signed_in_home
+      debates = Debate.sort_by_hot_score.page(params[:page]).per(10).for_render
+      set_debate_votes(debates)
+
+      proposals = Proposal.sort_by_hot_score.page(params[:page]).per(10).for_render
+      set_proposal_votes(proposals)
+
+      @list = (debates.to_a + proposals.to_a).sort{|a, b| b.hot_score <=> a.hot_score}
+      @paginator = debates.total_pages > proposals.total_pages ? debates : proposals
+
+      render 'signed_in_home'
+    end
 end
diff --git a/app/views/welcome/signed_in_home.html.erb b/app/views/welcome/signed_in_home.html.erb
new file mode 100644
index 000000000..647237fee
--- /dev/null
+++ b/app/views/welcome/signed_in_home.html.erb
@@ -0,0 +1,19 @@
+<section role="main">
+  <div class="wrap row">
+    <div id="activities" class="debates-list small-12 medium-9 column">
+
+      <div class="filters">
+
+        <div class="small-12 medium-7 left">
+            <h2 class="margin-top">
+              <%= t('welcome.signed_in_home_title') %>
+            </h2>
+        </div>
+
+        <%= render @list %>
+        <%= paginate @paginator %>
+      </div>
+    </div>
+
+  </div>
+</section>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 40b6c9fe5..2823258f1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -289,6 +289,7 @@ en:
   welcome:
     last_debates: Last debates
     last_proposals: Last proposals
+    signed_in_home_title: Recent activity
     welcome:
       title: Account verification
       instructions_1_html: "Welcome to the public participation website."
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 265680443..d9239e3a9 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -289,6 +289,7 @@ es:
   welcome:
     last_debates: Últimos debates
     last_proposals: Últimas propuestas
+    signed_in_home_title: Actividad reciente
     welcome:
       title: Verificación de cuenta
       instructions_1_html: "Bienvenido a la página de participación ciudadana"
diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb
index ff87a294b..5858566e4 100644
--- a/spec/features/home_spec.rb
+++ b/spec/features/home_spec.rb
@@ -2,30 +2,73 @@ require 'rails_helper'
 
 feature "Home" do
 
-  scenario 'featured debates' do
-    featured_debates = [create(:debate), create(:debate), create(:debate)]
+  feature "For not logged users" do
+    scenario 'featured debates' do
+      featured_debates = [create(:debate), create(:debate), create(:debate)]
 
-    visit root_path
+      visit root_path
 
-    expect(page).to have_selector('#featured-debates .debate-featured', count: 3)
-    featured_debates.each do |debate|
-      within('#featured-debates') do
-        expect(page).to have_content debate.title
-        expect(page).to have_css("a[href='#{debate_path(debate)}']", text: debate.description)
+      expect(page).to have_selector('#featured-debates .debate-featured', count: 3)
+      featured_debates.each do |debate|
+        within('#featured-debates') do
+          expect(page).to have_content debate.title
+          expect(page).to have_css("a[href='#{debate_path(debate)}']", text: debate.description)
+        end
       end
     end
 
+    scenario 'featured proposals' do
+      featured_proposals = [create(:proposal), create(:proposal), create(:proposal)]
+
+      visit root_path
+
+      expect(page).to have_selector('#featured-proposals .proposal-featured', count: 3)
+      featured_proposals.each do |proposal|
+        within('#featured-proposals') do
+          expect(page).to have_content proposal.title
+          expect(page).to have_css("a[href='#{proposal_path(proposal)}']", text: proposal.description)
+        end
+      end
+    end
+
+    scenario "Order by confidence score" do
+      create(:debate, confidence_score: 100, title: 'best debate')
+      create(:debate, confidence_score: -20, title: 'worst debate')
+      create(:debate, confidence_score: 50,  title: 'medium debate')
+
+      create(:proposal, confidence_score: 100, title: 'best proposal')
+      create(:proposal, confidence_score: -20, title: 'worst proposal')
+      create(:proposal, confidence_score: 50,  title: 'medium proposal')
+
+      visit root_path
+
+      expect('best debate').to appear_before('medium debate')
+      expect('medium debate').to appear_before('worst debate')
+      expect('best proposal').to appear_before('medium proposal')
+      expect('medium proposal').to appear_before('worst proposal')
+    end
   end
 
-  scenario "Order by confidence score" do
-    create(:debate, confidence_score: 100, title: 'best')
-    create(:debate, confidence_score: -20, title: 'worst')
-    create(:debate, confidence_score: 50,  title: 'medium')
+  feature "For signed in users" do
+    scenario 'debates and proposals order by hot_score' do
+      create(:debate, title: 'best debate 100').update_column(:hot_score, 100)
+      create(:debate, title: 'worst debate 50').update_column(:hot_score, 50)
+      create(:debate, title: 'medium debate 70').update_column(:hot_score, 70)
 
-    visit root_path
+      create(:proposal, title: 'best proposal 90').update_column(:hot_score, 90)
+      create(:proposal, title: 'worst proposal 60').update_column(:hot_score, 60)
+      create(:proposal, title: 'medium proposal 80').update_column(:hot_score, 80)
 
-    expect('best').to appear_before('medium')
-    expect('medium').to appear_before('worst')
+      login_as(create(:user))
+
+      visit root_path
+
+      expect('best debate 100').to    appear_before('best proposal 90')
+      expect('best proposal 90').to   appear_before('medium proposal 80')
+      expect('medium proposal 80').to appear_before('medium debate 70')
+      expect('medium debate 70').to   appear_before('worst proposal 60')
+      expect('worst proposal 60').to  appear_before('worst debate 50')
+    end
   end
 
 end