diff --git a/lib/Components/QuickReminder.dart b/lib/Components/QuickReminder.dart
index 5d4152f..7d0d48c 100644
--- a/lib/Components/QuickReminder.dart
+++ b/lib/Components/QuickReminder.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../database/controller.dart';
+import 'package:progetto_m335_flutter/database/database.dart';
 import '../model/promemoria.dart';
 import '../navigation.dart';
 
@@ -11,7 +11,7 @@ class QuickReminder extends StatefulWidget {
 }
 
 class _QuickReminderState extends State<QuickReminder> {
-  Controller controller = Controller();
+  NoteDatabase db = NoteDatabase.instance;
 
   @override
   Widget build(BuildContext context) {
@@ -25,7 +25,7 @@ class _QuickReminderState extends State<QuickReminder> {
             labelText: 'New Reminder',
           ),
           onSubmitted: (String value) {
-            controller.addPromemoria(Promemoria.today(
+            db.addPromemoria(Promemoria.today(
                 value,
                 DateTime.now().toString(),
                 DateTime.now().toString(),
diff --git a/lib/database/database.dart b/lib/database/database.dart
index 83b0d61..b754064 100644
--- a/lib/database/database.dart
+++ b/lib/database/database.dart
@@ -63,14 +63,26 @@ class NoteDatabase {
 
   Future<List<Note>> getAllNote() async {
     var notes = await _database?.query(noteTable);
-    List<Note> noteList = notes!.map((e) => Note.fromJson(e)).toList();
+
+    if(notes == null) {
+      return [];
+    }
+
+    List<Note> noteList = notes.map((e) => Note.fromJson(e)).toList();
     return noteList;
   }
 
   Future<List<Promemoria>> getAllPromemoria() async {
     var promemorias = await _database?.query(promemoriaTable);
+
+    if(promemorias == null) {
+      return [];
+    }
+
     List<Promemoria> promemoriaList =
-    promemorias!.map((e) => Promemoria.fromJson(e)).toList();
+    promemorias.map((e) => Promemoria.fromJson(e)).toList();
+
+
     return promemoriaList;
   }
 
@@ -102,6 +114,8 @@ class NoteDatabase {
     '${note.description}'
   )
 ''');
+
+    syncData();
   }
 
   //add Promemoria
@@ -127,6 +141,8 @@ class NoteDatabase {
         '${promemoria.color}'
       )
     ''');
+
+    syncData();
   }
 
   void deleteAll() async {
diff --git a/lib/pages/TodayView.dart b/lib/pages/TodayView.dart
index f3f2750..67f5df5 100644
--- a/lib/pages/TodayView.dart
+++ b/lib/pages/TodayView.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:progetto_m335_flutter/database/database.dart';
 
 //import components
 import '../Components/Reminder.dart';
 import '../Components/QuickReminder.dart';
 import '../model/promemoria.dart';
-import '../database/controller.dart';
 
 class TodayView extends StatefulWidget {
   const TodayView({super.key});
@@ -15,19 +15,19 @@ class TodayView extends StatefulWidget {
 
 class _TodayViewState extends State<TodayView> {
 
-  Controller controller = Controller();
-
   var _selectedDate = DateTime.now();
 
   List<Promemoria> listaPromemoria = [];
 
+  NoteDatabase db = NoteDatabase.instance;
+
   /*[
     Promemoria.today("Primo promemoria", DateTime.now().toString(), DateTime.now().toString(), DateTime.now().toString(), "Descrizione primo promemoria"),
     Promemoria.today("Secondo promemoria", DateTime.now().toString(), DateTime.now().toString(), DateTime.now().toString(), "Descrizione secondo promemoria"),
   ];*/
 
   getAllPromemoria() async {
-    List<Promemoria> temp = await controller.getAllPromemoria();
+    List<Promemoria> temp = await db.getAllPromemoria() as List<Promemoria>;
     setState(() {
       listaPromemoria = temp;
     });