Fixed for the database

Ready for the Presentation