Making a few changes and make sure to edit db for web server