diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb
index c0040ed..acb5121 100644
--- a/app/controllers/org_admin/templates_controller.rb
+++ b/app/controllers/org_admin/templates_controller.rb
@@ -68,7 +68,17 @@
 
       @current = Template.current(@template.dmptemplate_id)
 
-      unless @template == @current
+      if @template == @current 
+        if @template.published?
+          new_version = @template.get_new_version
+          if !new_version.nil?
+            redirect_to(action: 'edit', id: new_version.id)
+            return
+          else
+            flash[:alert] = _('Unable to create a new version of this template. You are currently working with a published copy.')
+          end
+        end
+      else
         flash[:notice] = _('You are viewing a historical version of this template. You will not be able to make changes.')
       end
 
@@ -106,6 +116,13 @@
           return
         end
 
+        # TODO dirty check at template model instead of here for reusability, i.e. method dirty? passing a template object	
+        if @template.description != params["template-desc"] ||
+                @template.title != params[:template][:title] ||
+                @template.links != template_links	
+          @template.dirty = true	
+        end
+        
         @template.description = params["template-desc"]
         @template.links = template_links if template_links.present?
       
diff --git a/app/controllers/phases_controller.rb b/app/controllers/phases_controller.rb
index f5c2cff..039f30a 100644
--- a/app/controllers/phases_controller.rb
+++ b/app/controllers/phases_controller.rb
@@ -44,17 +44,8 @@
 
   #show and edit a phase of the template
   def admin_show
-    phase = Phase.includes(:template, :sections).order(:number).find(params[:id])
-    authorize phase
-
-    # If the user is an OrgAdmin and the existing template is published then version
-    # it before proceeding
-    if current_user.can_org_admin? && phase.template.published?
-      new_version = phase.template.get_new_version      
-      @phase = new_version.phases.find_by(title: phase.title, number: phase.number)
-    else
-      @phase = phase
-    end
+    @phase = Phase.includes(:sections).order(:number).find(params[:id])
+    authorize @phase
 
     @current = Template.current(@phase.template.dmptemplate_id)
     @edit = (@phase.template.org == current_user.org) && (@phase.template == @current)
@@ -68,8 +59,6 @@
       @original_org = @phase.template.org
     end
     
-    in_use_check(@phase)
-    
     render('/org_admin/templates/container',
       locals: {
         partial_path: 'admin_show',
@@ -182,25 +171,4 @@
       render 'admin_show'
     end
   end
-
-
-  private
-    def in_use_check(phase)
-      # Check to see if anyone else has recently been working with this template. If so warn the user
-      current_editors = Rails.cache.read("phase_#{phase.id}") || []
-      current_editors.delete(current_user.id)
-      
-      unless current_editors.empty?
-        flash[:notice] = _('%{users} also appears to be editing this phase!') % 
-          { users: current_editors.collect{ |u| User.find(u).name(false) if User.find(u).present? }.join(', ') }
-      end
-      
-      current_editors << current_user.id unless current_editors.include?(current_user.id)
-      # Record the activity in the Rails cache
-      begin
-        Rails.cache.write("phase_#{phase.id}", current_editors, :expires_in => 15.minutes)
-      rescue Exception => e
-        logger.error("Caught exception RSS parse: #{e}.")
-      end
-    end
 end