diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index a3cfdc7..b33b262 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -19,6 +19,17 @@
 
 $(document).on('turbolinks:load', function() {
   $(".alert").fadeIn(0).delay(5000).fadeOut(500);
+	$(".js-update-room-activity").click(function (e) {
+		console.log(this);
+		$.ajax({
+		  method: "PATCH",
+		  url: "/room_activities/" + $(this).data("id"),
+		  data: { room_activity: { enabled: this.checked } }
+		})
+		  .done(function( msg ) {
+		    alert( "Updated");
+		  });
+	});
 });
 
 navigator.serviceWorker && navigator.serviceWorker.register('/service_worker.js')
diff --git a/app/controllers/room_activities_controller.rb b/app/controllers/room_activities_controller.rb
new file mode 100644
index 0000000..e3e0d59
--- /dev/null
+++ b/app/controllers/room_activities_controller.rb
@@ -0,0 +1,48 @@
+class RoomActivitiesController < ApplicationController
+  before_action :authenticate_user!
+  before_action :require_room_presence
+
+  def new
+    @room_activities = @room.room_activities.unscoped
+  end
+
+  def create
+    @room_activity = RoomActivity.new(room_activity_params)
+    if @room_activity.save
+      # redirect_to dashboard_path, notice: "RoomActivity \"#{@room_activity.name}\" has been successfully created"
+      flash[:notice] = "RoomActivity \"#{@room_activity.name}\" has been successfully created"
+    else
+      flash[:alert] = @room_activity.errors.full_messages.join(',') # 'There was an error creating this activity!'
+    end
+    redirect_back(fallback_location: root_path)
+  end
+
+  def update
+    room_activity = RoomActivity.find(params[:id])
+    room_activity.update(room_activity_params)
+    # respond
+  end
+
+  def destroy
+    room_activity = RoomActivity.find(params[:id])
+    if room_activity.destroy
+      flash[:notice] = "Activity \"#{room_activity.name}\" has been successfully deleted"
+    else
+      flash[:alert] = 'There was an error deleting this activity!'
+    end
+    redirect_back(fallback_location: root_path)
+  end
+
+  private
+
+  def set_room
+    @room = current_user.room
+  end
+
+  def room_activity_params
+    params.require(:room_activity)
+          .permit(:name, :enabled)
+          .merge(room_id: @room.id)
+    # .tap { |params| params[:creator_id] = current_user.id }
+  end
+end
diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
index ecbbcf1..521e2ac 100644
--- a/app/controllers/rooms_controller.rb
+++ b/app/controllers/rooms_controller.rb
@@ -2,7 +2,6 @@ class RoomsController < ApplicationController
   before_action :authenticate_user!, except: [:join]
   before_action :require_room_presence, only: [:edit, :update, :destroy]
   before_action :require_room_absence, only: [:new, :create]
-  before_action :set_room, only: [:edit, :update, :destroy]
 
   def index
     @rooms = Room.includes(:users).all.order(:id)
@@ -25,13 +24,13 @@ def create
   end
 
   def edit
-    ids = current_user.room.user_ids
-    ids << nil # add default actions
-    @actions = Action.where(creator_id: ids)
+    # ids = current_user.room.user_ids
+    # ids << nil # add default actions
+    @room_activities = @room.room_activities.unscoped # Action.where(creator_id: ids)
   end
 
   def update
-    if RoomUpdater.new(@room, room_params).update
+    if @room.update(room_params) # RoomUpdater.new(@room, room_params).update
       redirect_to dashboard_path, notice: 'You have successfully updated your room.'
     else
       render :edit
@@ -70,11 +69,7 @@ def reset_progress
 
   private
 
-  def set_room
-    @room = current_user.room
-  end
-
   def room_params
-    params.require(:room).permit(:name, action_ids: [])
+    params.require(:room).permit(:name)
   end
 end
diff --git a/app/models/room_activity.rb b/app/models/room_activity.rb
index 541863d..bc5468a 100644
--- a/app/models/room_activity.rb
+++ b/app/models/room_activity.rb
@@ -13,6 +13,9 @@ class RoomActivity < ApplicationRecord
 
   validates :name, presence: true
 
+  scope :enabled, -> { where(enabled: true) }
+  default_scope { enabled }
+
   delegate :users, to: :room
 
   def user_activities
@@ -31,4 +34,8 @@ def next_on_user
     user_activities.find { |user_activity| user_activity.value == min_value }
                    .user
   end
+
+  def enabled?
+    enabled
+  end
 end
diff --git a/app/views/room_activities/_edit_form.html.slim b/app/views/room_activities/_edit_form.html.slim
new file mode 100644
index 0000000..cb99dd0
--- /dev/null
+++ b/app/views/room_activities/_edit_form.html.slim
@@ -0,0 +1,8 @@
+.form.row
+  - @room_activities.each do |activity|
+    .checkbox.col-sm-6
+      label for="#{dom_id(activity)}"
+        = check_box_tag 'activity_ids[]', activity.id, activity.enabled?, id: dom_id(activity), class: "js-update-room-activity", data: { id: activity.id }
+        = activity.name
+      / - unless activity.creator.nil?
+      / = link_to '&times;'.html_safe, room_activity_path(id: activity.id), method: :delete
diff --git a/app/views/room_activities/_form.html.slim b/app/views/room_activities/_form.html.slim
new file mode 100644
index 0000000..9820d7f
--- /dev/null
+++ b/app/views/room_activities/_form.html.slim
@@ -0,0 +1,4 @@
+= simple_form_for(RoomActivity.new) do |f|
+  = f.input :name, placeholder: 'Name', label: false
+  .actions.text-center
+    = f.button :submit, 'Create activity', class: 'btn btn-primary'
diff --git a/app/views/room_activities/new.html.slim b/app/views/room_activities/new.html.slim
new file mode 100644
index 0000000..d99b711
--- /dev/null
+++ b/app/views/room_activities/new.html.slim
@@ -0,0 +1,12 @@
+= title 'Step 2: Add activities to your room'
+h3.text-center We created some activities for you
+p.text-center.text-muted You can delete them, if you don't like them
+= render 'edit_form'
+
+h3.text-center Or you can create your own activities
+= render 'form'
+
+.pull-right
+	= link_to dashboard_path, class: 'btn btn-primary' do
+		| Continue to Dashboard 
+		= fa_icon('arrow-right')
diff --git a/app/views/rooms/edit.html.slim b/app/views/rooms/edit.html.slim
index 6f21669..23c6eca 100644
--- a/app/views/rooms/edit.html.slim
+++ b/app/views/rooms/edit.html.slim
@@ -4,6 +4,12 @@ hr
 #edit-room
   h3.text-center Edit room
   = render partial: 'form', locals: { room: @room, submit_button_text: 'Update room' }
+  hr
+  h3.text-center Edit your activities
+  = render 'room_activities/edit_form'
+  hr
+  h3.text-center Create new activity
+  = render 'room_activities/form'
 
 hr
 #danger-zone
diff --git a/config/routes.rb b/config/routes.rb
index efd3e0d..658f43e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -21,7 +21,7 @@
     post 'accept', on: :member
   end
 
-  resources :room_activities, only: [:new, :create, :destroy]
+  resources :room_activities, only: [:new, :update, :create, :destroy]
 
   resources :punishments, only: [:index]
 end
diff --git a/spec/features/dashboard_spec.rb b/spec/features/dashboard_spec.rb
index 520f5f9..3b6246a 100644
--- a/spec/features/dashboard_spec.rb
+++ b/spec/features/dashboard_spec.rb
@@ -1,6 +1,6 @@
 RSpec.feature 'Dashboard' do
   let(:user) { create(:user) }
-  let(:room) { create(:room, :with_old_setup) }
+  let(:room) { create(:room, :with_activities) }
 
   background do
     user.join_room(room)
@@ -9,17 +9,17 @@
   end
 
   scenario 'User submits done action' do
-    room_action = room.room_actions.first
+    # room_action = room.room_actions.first
 
-    expect {
-      select room_action.name, from: 'user_action_id'
-      click_button 'Submit'
-    }.to change { user.user_actions.find_by(room_action_id: room_action.id).value }.by(1)
+    # expect {
+    #   select room_action.name, from: 'user_action_id'
+    #   click_button 'Submit'
+    # }.to change { user.user_actions.find_by(room_action_id: room_action.id).value }.by(1)
 
-    expect(page).to have_content 'Good job'
-    expect(room_action.next_on_user).not_to eq user
+    # expect(page).to have_content 'Good job'
+    # expect(room_action.next_on_user).not_to eq user
 
-    click_on 'History'
+    # click_on 'History'
     # TODO: turn on this test, it is temporary disabled
     # within '#history' do
     #   expect(page).to have_content "#{user.name} has done \"#{room_action.name}\""
diff --git a/spec/features/rooms_spec.rb b/spec/features/rooms_spec.rb
index f557472..ea35acd 100644
--- a/spec/features/rooms_spec.rb
+++ b/spec/features/rooms_spec.rb
@@ -1,52 +1,65 @@
 RSpec.feature 'Rooms' do
-  let(:user) { create(:user) }
-  let(:room) { create(:room) }
+  context 'creation' do
+    let(:user) { create(:user) }
+    let(:new_activity_name) { 'playing video games' }
 
-  background do
-    sign_in user
-    visit root_path
+    background do
+      sign_in user
+      visit root_path
+    end
+
+    scenario 'User creates new room' do
+      click_link 'Create new room'
+      fill_in 'Name', with: 'My room'
+      click_button 'Create room'
+      expect(page).to have_content 'You have successfully created new room "My room".'
+      RoomActivity::DEFAULT_ROOM_ACTIVITIES.each do |activity_name|
+        expect(page).to have_content activity_name
+      end
+
+      fill_in 'Name', with: new_activity_name
+      click_button 'Create activity'
+      expect(page).to have_content new_activity_name
+
+      click_on 'Continue to Dashboard'
+      expect(page).to have_content user.name
+      expect(page).to have_content new_activity_name
+      RoomActivity::DEFAULT_ROOM_ACTIVITIES.each do |activity_name|
+        expect(page).to have_content activity_name
+      end
+    end
   end
 
-  let(:new_activity_name) { 'playing video games' }
-  scenario 'User creates new room' do
-    click_link 'Create new room'
-    fill_in 'Name', with: 'My room'
-    click_button 'Create room'
-    expect(page).to have_content 'You have successfully created new room "My room".'
-    RoomActivity::DEFAULT_ROOM_ACTIVITIES.each do |activity_name|
-      expect(page).to have_content activity_name
+  context 'update' do
+    let(:room) { create :room, :with_activities }
+    let(:user) { room.users.first }
+    let(:new_room_name) { 'New room name' }
+    let(:room_activity_name) { room.room_activities.first.name }
+    let(:new_room_activity_name) { room.room_activities.first.name }
+
+    background do
+      sign_in user
+      visit dashboard_path
+      click_link 'Room settings'
     end
 
-    fill_in 'Name', with: new_activity_name
-    click_button 'Create activity'
-    expect(page).to have_content new_activity_name
+    scenario 'User updates room' do
+      within '.edit_room' do
+        fill_in 'Name', with: new_room_name
+        click_button 'Update room'
+      end
+
+      expect(room.reload.name).to eq new_room_name
+      expect(page).to have_content 'You have successfully updated your room'
+    end
 
-    click_on 'Continue to Dashboard'
-    expect(page).to have_content user.name
-    expect(page).to have_content new_activity_name
-    RoomActivity::DEFAULT_ROOM_ACTIVITIES.each do |activity_name|
-      expect(page).to have_content activity_name
+    scenario 'User changes room activities', js: true do
+      uncheck room_activity_name
+      expect(room.room_activities.find_by(name: room_activity_name).enabled?).to eq false
     end
   end
 
-  #   scenario 'User updates room' do
-  #     user.join_room(room)
-  #     new_activity = create(:activity, creator: user)
-  #     visit dashboard_path
-  #     click_link 'Room settings'
-  #
-  #     fill_in 'Name', with: 'New room name'
-  #     uncheck room.activitys.first.name
-  #     check new_activity.name
-  #     click_button 'Update room'
-  #
-  #     expect(page).to have_content 'You have successfully updated your room.'
-  #     room.reload
-  #     expect(room.name).to eq 'New room name'
-  #     expect(room.activitys).to include(new_activity)
-  #   end
-  #
-  #   scenario 'User leaves room' do
+  # scenario 'User leaves room' do
   #     user = room.users.first
   #     sign_in user
   #     visit dashboard_path