Database has been changed to reflect the changes Zack wants