Issue #130, latest database edits!!!!!!!