With these changes we are retrieving virtually everything from the database.