diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b399c22..2c2507f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -113,8 +113,8 @@ class UsersController < ApplicationController
 		unless @current_user.courses.empty?
 			@news = News.find(:all, :conditions => [ 'receiver_id in (?)', @current_user.courses ],
 					:order => 'timestamp desc', :limit => 5)
-			@events = Event.find(:all, :conditions => [ 'course_id in (?) and (date > ?) and (date < ?)',
-			@current_user.courses, 1.day.ago, 21.days.from_now ], :order => 'date')
+			@events = Event.find(:all, :conditions => [ 'course_id in (?) and (time > ?) and (time < ?)',
+			@current_user.courses, 1.day.ago, 21.days.from_now ], :order => 'time')
 		end
 	end
 
diff --git a/app/models/course.rb b/app/models/course.rb
index a58c8a8..23d36ae 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -26,7 +26,7 @@ class Course < ActiveRecord::Base
 	         :foreign_key => "receiver_id",
 			 :order => 'id desc'
 
-	has_many :events, :order => "date asc, time asc"
+	has_many :events, :order => "time asc"
 
 	has_many :log_entries, :order => "created_at desc"
 
diff --git a/db/migrate/029_event_time.rb b/db/migrate/029_event_time.rb
index b68c7d2..a3b3c0d 100644
--- a/db/migrate/029_event_time.rb
+++ b/db/migrate/029_event_time.rb
@@ -1,7 +1,8 @@
 class EventTime < ActiveRecord::Migration
   def self.up
-    change_column :events, :date, :date, :null => true
-	change_column :events, :time, :datetime
+    remove_column :events, :date
+	remove_column :events, :time
+	add_column :events, :time, :datetime, :null => false, :default => Time.now
   end
 
   def self.down
diff --git a/db/schema.rb b/db/schema.rb
index 81166da..030eb6e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -37,13 +37,12 @@ ActiveRecord::Schema.define(:version => 29) do
   end
 
   create_table "events", :force => true do |t|
-    t.string   "title",                      :null => false
-    t.date     "date"
-    t.datetime "time",                       :null => false
-    t.integer  "created_by",                 :null => false
-    t.integer  "course_id",   :default => 0, :null => false
+    t.string   "title",                                          :null => false
+    t.integer  "created_by",                                     :null => false
+    t.integer  "course_id",   :default => 0,                     :null => false
     t.text     "description"
     t.datetime "deleted_at"
+    t.datetime "time",        :default => '2008-03-05 04:25:27', :null => false
   end
 
   create_table "log_entries", :force => true do |t|
diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml
index a2d51ef..5efdcac 100644
--- a/test/fixtures/events.yml
+++ b/test/fixtures/events.yml
@@ -16,7 +16,6 @@ event1:
   course_id: 1
   created_by: 1
   title: Event 1
-  date: <%= Date.today %>
   time: <%= Time.now %>
   description: A random test event
 #two:
diff --git a/test/functional/events_controller_test.rb b/test/functional/events_controller_test.rb
index 5224c1e..3fe5ada 100644
--- a/test/functional/events_controller_test.rb
+++ b/test/functional/events_controller_test.rb
@@ -32,8 +32,8 @@ class EventsControllerTest < Test::Unit::TestCase
 		setup { login_as :bob }
 		should_be_restful do |resource|
 			resource.parent = [ :course ]
-			resource.create.params = { :title => 'test', :date => Date.today, :time => Time.now, :description => 'test', :created_by => 1 }
-			resource.update.params = { :title => 'test', :date => Date.today, :time => Time.now, :description => 'test', :created_by => 1 }
+			resource.create.params = { :title => 'test', :time => Time.now, :description => 'test', :created_by => 1 }
+			resource.update.params = { :title => 'test', :time => Time.now, :description => 'test', :created_by => 1 }
 
 		end
 	end
@@ -43,8 +43,8 @@ class EventsControllerTest < Test::Unit::TestCase
 		setup { logout }
 		should_be_restful do |resource|
 			resource.parent = [ :course ]
-			resource.create.params = { :title => 'test', :date => Date.today, :time => Time.now, :description => 'test', :created_by => 1 }
-			resource.update.params = { :title => 'test', :date => Date.today, :time => Time.now, :description => 'test', :created_by => 1 }
+			resource.create.params = { :title => 'test', :time => Time.now, :description => 'test', :created_by => 1 }
+			resource.update.params = { :title => 'test', :time => Time.now, :description => 'test', :created_by => 1 }
 			resource.denied.actions = [ :new, :edit, :create, :update, :destroy ]
 			resource.denied.redirect = "'/login'"
 			resource.denied.flash = /must be logged in/i
diff --git a/test/unit/course_test.rb b/test/unit/course_test.rb
index de6451c..e634e45 100644
--- a/test/unit/course_test.rb
+++ b/test/unit/course_test.rb
@@ -36,7 +36,7 @@ class CourseTest < Test::Unit::TestCase
 				:timestamp => Time.now, :type => "News",
 				:sender_id => 0, :receiver_id => course.id)
 		
-		event = Event.create(:title => 'test', :date => Time.now, :time => Time.now,
+		event = Event.create(:title => 'test', :time => Time.now,
 				:created_by => 0, :course_id => course.id, :description => 'test')
 
 		# Deleta o curso