Updated DB and Java by Hassam