Updated Database and Comments