changed java.sql.Date to java.sql.Timestamp