updated with some database changes.