Spencer's changes to the database