work on Database.java