Database changes from meeting (Jasjot)

These changes were made by Jasjot from my computer in our Monday night
meeting on campus